diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
index ba896da37..aaedcc8df 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
@@ -13,6 +13,7 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
+import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import java.io.IOException;
@@ -119,7 +120,9 @@ public class UploadController {
                         contribution.setDataLength(length);
                     }
                 } catch(IOException e) {
-                    throw new RuntimeException(e);
+                    Log.e("UploadController", "IO Exception: ", e);
+                } catch(NullPointerException e) {
+                    Log.e("UploadController", "Null Pointer Exception: ", e);
                 }
 
                 String mimeType = (String)contribution.getTag("mimeType");
@@ -142,10 +145,10 @@ public class UploadController {
                             dateCreated = new Date();
                         }
                         contribution.setDateCreated(dateCreated);
+                        cursor.close();
                     } else {
                         contribution.setDateCreated(new Date());
                     }
-                    cursor.close();
                 }
 
                 return contribution;