diff --git a/src/android/Capture.java b/src/android/Capture.java
index 2318a065..a24511e5 100644
--- a/src/android/Capture.java
+++ b/src/android/Capture.java
@@ -346,8 +346,19 @@ public void run() {
 
                     @Override
                     public void run() {
-                        // Get the uri of the video clip
-                        Uri data = intent.getData();
+                    
+                        Uri data = null;
+                        
+                        if (intent != null){
+                            // Get the uri of the video clip
+                            data = intent.getData();
+                        }
+                        
+                        if( data == null){
+                           File movie = new File(getTempDirectoryPath(), "Capture.avi");
+                           data = Uri.fromFile(movie);
+                        }
+                        
                         // create a file object from the uri
                         if(data == null)
                         {
@@ -428,7 +439,6 @@ private JSONObject createMediaFile(Uri data) {
             // this will never happen
             e.printStackTrace();
         }
-
         return obj;
     }