From 50b3fd382cb3303bdf3a196586968994b9187e0a Mon Sep 17 00:00:00 2001
From: Evan Harris <eharris@puremagic.com>
Date: Mon, 8 Jul 2019 02:57:41 -0500
Subject: [PATCH] Handle null without exception

---
 .../org/airsonic/player/controller/CoverArtController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
index 1009b32a..6210ddd0 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
@@ -628,10 +628,10 @@ public class CoverArtController implements LastModified {
             try {
                 in = getImageInputStreamForVideo(mediaFile, width, height, offset);
                 BufferedImage result = ImageIO.read(in);
-                if (result == null) {
-                    throw new NullPointerException();
+                if (result != null) {
+                    return result;
                 }
-                return result;
+                LOG.warn("Failed to process cover art for " + mediaFile + ": {}", result);
             } catch (Throwable x) {
                 LOG.warn("Failed to process cover art for " + mediaFile + ": " + x, x);
             } finally {