diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
index 0c244cef..3b3476b1 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
@@ -414,7 +414,7 @@ public class IITC_FileManager {
         public void onActivityResult(final int resultCode, final Intent data) {
             mIitc.deleteResponseHandler(this);
 
-            if (resultCode != Activity.RESULT_OK) return;
+            if (resultCode != Activity.RESULT_OK || data == null) return;
 
             mData = data;
 
diff --git a/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java b/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java
index f01e9dc9..e6448375 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/SaveToFile.java
@@ -24,12 +24,11 @@ public class SaveToFile extends Activity implements Runnable {
     @Override
     protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
         if (requestCode == REQUEST_SAVE_FILE) {
-            mData = data.getData();
-            if (resultCode != Activity.RESULT_OK || mData == null) {
+            if (resultCode != Activity.RESULT_OK || data == null) {
                 finish();
                 return;
             }
-
+            mData = data.getData();
             (new Thread(this)).start();
         }