diff --git a/Bolts/Common/BFTask.m b/Bolts/Common/BFTask.m
index a708ef09b..6fc8585f9 100644
--- a/Bolts/Common/BFTask.m
+++ b/Bolts/Common/BFTask.m
@@ -207,6 +207,11 @@ - (NSError *)error {
 }
 
 - (void)setError:(NSError *)error {
+    if (!error) {
+        NSLog(@"Bolts bug: setting nil error (their bug): %s", __PRETTY_FUNCTION__);
+        return;
+    }
+
     if (![self trySetError:error]) {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Cannot set the error on a completed task."];