diff --git a/bot/reviewbot/processing/review.py b/bot/reviewbot/processing/review.py
index 3766d4f3862945a81f1b39cf431b07c309aa5150..fff2509882ce11c27d724cddc2eafabc1f580551 100644
--- a/bot/reviewbot/processing/review.py
+++ b/bot/reviewbot/processing/review.py
@@ -113,7 +113,10 @@
             return None
 
         try:
-            contents = self._api_filediff.get_patched_file().data
+            try:
+                contents = self._api_filediff.get_patched_file().data
+            except NotImplementedError:
+                return None
 
             if isinstance(contents, str):
                 contents = contents.encode('utf-8')
@@ -148,7 +151,10 @@
             return None
 
         try:
-            contents = self._api_filediff.get_original_file().data
+            try:
+                contents = self._api_filediff.get_original_file().data
+            except NotImplementedError:
+                return None
 
             if isinstance(contents, str):
                 contents = contents.encode('utf-8')
diff --git a/bot/reviewbot/testing/testcases.py b/bot/reviewbot/testing/testcases.py
index c336e2bb5fe19c920439dc819e515490ec51f227..fa0622cd1eee75bd86e306770ba5af2dacdb353f 100644
--- a/bot/reviewbot/testing/testcases.py
+++ b/bot/reviewbot/testing/testcases.py
@@ -276,7 +276,9 @@
             transport=self._transport,
             payload={
                 'total_results': 0,
+                'reviews': [],
             },
+            token='reviews',
             url='%sreview-bot-reviews/' % self._url)
 
     def get_tools(self, **kwargs):
@@ -294,7 +296,9 @@
             transport=self._transport,
             payload={
                 'total_results': 0,
+                'tools': [],
             },
+            token='tools',
             url='%stools/' % self._url)
 
 
@@ -424,7 +428,9 @@
             transport=self._transport,
             payload={
                 'total_results': 0,
+                'user_file_attachments': [],
             },
+            token='user_file_attachments',
             url='%susers/%s/user-file-attachments/' % (self._url, username))