Merge pull request MISP#85 from MISP/errorhandling2

Errorhandling2
LOUISLCE · Feb 23, 2017 · 9d388cf · 9d388cf
2 parents 1ef6360 + 9576058
commit 9d388cf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pymisp/api.py b/pymisp/api.py
@@ -203,9 +203,14 @@ def _check_response(self, response):
                 errors.append(to_return['error'])
             else:
                 errors += to_return['error']
+        if to_return.get('errors'):
+            if not isinstance(to_return['errors'], list):
+                errors.append(to_return['errors'])
+            else:
+                errors += to_return['errors']
 
         if 400 <= response.status_code < 500:
-            if to_return.get('error') is None and to_return.get('message'):
+            if not errors and to_return.get('message'):
                 errors.append(to_return['message'])
             else:
                 errors.append(basestring(response.status_code))