diff --git a/src/inputs/pipe.c b/src/inputs/pipe.c
index 621f04af..99c1685a 100644
--- a/src/inputs/pipe.c
+++ b/src/inputs/pipe.c
@@ -417,7 +417,7 @@ parse_item(struct input_metadata *m, const char *item)
       if (data != &progress && data != &volume)
 	free(*data);
 
-      CHECK_NULL(L_PLAYER, *data = b64_decode(s));
+      *data = b64_decode(s);
 
       DPRINTF(E_DBG, L_PLAYER, "Read Shairport metadata (type=%8x, code=%8x): '%s'\n", type, code, *data);
 
diff --git a/src/misc.c b/src/misc.c
index 5bfed5d8..f74fe924 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -738,9 +738,7 @@ b64_decode(const char *b64)
 
   len = strlen(b64);
 
-  str = (char *)malloc(len);
-  if (!str)
-    return NULL;
+  CHECK_NULL(L_MISC, str = malloc(len));
 
   memset(str, 0, len);