diff --git a/zappa/utilities.py b/zappa/utilities.py
index 132ff1fe5..1a82070da 100644
--- a/zappa/utilities.py
+++ b/zappa/utilities.py
@@ -360,8 +360,12 @@ def status(self, function):
                     response = self._lambda.call("get_event_source_mapping", UUID=self._get_uuid(function))
                     LOG.debug(response)
                 except botocore.exceptions.ClientError:
-                    LOG.debug("event source %s does not exist", self.arn)
-                    response = None
+                    # https://github.com/zappa/Zappa/issues/1317
+                    if e.response['Error']['Code'] == 'ResourceNotFoundException':
+                        LOG.debug("event source %s does not exist", self.arn)
+                        response = None
+                    else:
+                        raise e
             else:
                 LOG.debug("No UUID for event source %s", self.arn)
             return response