diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
index 057706623f..ef1bdc6711 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
@@ -13,8 +13,10 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.model.GiphyResponse;
 import org.thoughtcrime.securesms.util.JsonUtils;
+import org.whispersystems.util.Base64;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -43,7 +45,8 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
       GiphyResponse response = performFetch(0, 1);
 
       return response.getPagination().getTotalCount();
-    } catch (IOException e) {
+    } catch (IOException | NullPointerException e) {
+      Log.w(TAG, "Failed to get size", e);
       return 0;
     }
   }
@@ -53,8 +56,8 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
     try {
       Log.d(TAG, "Loading from " + start + " to " + (start + length));
       return new LinkedList<>(performFetch(start, length).getData());
-    } catch (IOException e) {
-      Log.w(TAG, e);
+    } catch (IOException | NullPointerException e) {
+      Log.w(TAG, "Failed to load content", e);
       return new LinkedList<>();
     }
   }
@@ -73,6 +76,10 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
         throw new IOException("Unexpected code " + response);
       }
 
+      if (response.body() == null) {
+        throw new IOException("Response body was not present");
+      }
+
       return JsonUtils.fromJson(response.body().byteStream(), GiphyResponse.class);
     }
   }