diff --git a/iotclient/iot_client.py b/iotclient/iot_client.py
index 076b745..b2aeb78 100644
--- a/iotclient/iot_client.py
+++ b/iotclient/iot_client.py
@@ -83,8 +83,22 @@ def get_image(identifier):
             print_response(response)
             return False
         payload = response.json()
+        if not 'id' in payload:
+            print('no image id')
+            return False
+        if not 'metadata' in payload:
+            print('no metadata')
+            return False
+        if not 'image_data' in payload:
+            print('no Image data')
+            return False
         print(payload['id'])
         print(payload['metadata'])
+
+        if not 'filename' in payload['metadata']:
+            print('no filename in metadata')
+            return False
+
         b64encoded_image = unwrap_file(payload['image_data'])
         goal_folder_name = "images_fetch"
         path = "../../" + goal_folder_name + "/" + payload['metadata']['filename']
@@ -99,6 +113,14 @@ def get_image(identifier):
         out.write(b64encoded_image)
         out.close()
         os.system(goal_folder_path + os.path.sep + payload['metadata']['filename'])
+
+        txtpath = "../../" + goal_folder_name + "/" + payload['id'] + '.txt'
+        out = open(txtpath, 'w')
+        out.write(json.dumps(payload['metadata']))
+        out.close()
+        os.system(goal_folder_path + os.path.sep + payload['id'] + '.txt')
+
+
     except os.error as e:
         print("Error sending request {}".format(e))
     except KeyError as e:
diff --git a/middleware/app_be/views/rest_api.py b/middleware/app_be/views/rest_api.py
index c8536be..b55ccd9 100644
--- a/middleware/app_be/views/rest_api.py
+++ b/middleware/app_be/views/rest_api.py
@@ -97,7 +97,7 @@ class ImageEndpoint:
 
         if not MongoDBService.createSingle(metadata, identifier, decoded_image):
             print("Could not save metadata")
-            return JsonResponse({'Result': 'Error - could not upload to MongoDB', 'id': identifier, 'filename': filename}, status=500,safe=False)
+            return JsonResponse({'Result': 'Error - could not upload to MongoDB', 'id': identifier, 'filename': filename},status=500,safe=False)
         if not DropboxService.create_file(filename, decoded_image):
             print("Could not save image to dropbox")
             return JsonResponse({'Result': 'Error - could not upload to Dropbox', 'id': identifier, 'filename': filename},status=500, safe=False)