diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
index 9f9a2288..82e35156 100644
--- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
+++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
@@ -230,13 +230,13 @@ public class Camera1 extends CameraImpl {
                     mCameraParameters.getSupportedPreviewSizes(),
                     mCameraParameters.getSupportedPictureSizes()
             );
-            AspectRatio targetRatio = aspectRatios.last();
+            AspectRatio targetRatio = aspectRatios.size() > 0 ? aspectRatios.last() : null;
 
             Iterator<Size> descendingSizes = sizes.descendingIterator();
             Size size;
             while (descendingSizes.hasNext() && mCaptureSize == null) {
                 size = descendingSizes.next();
-                if (targetRatio.matches(size)) {
+                if (targetRatio == null || targetRatio.matches(size)) {
                     mCaptureSize = size;
                     break;
                 }
@@ -258,13 +258,13 @@ public class Camera1 extends CameraImpl {
                     mCameraParameters.getSupportedPreviewSizes(),
                     mCameraParameters.getSupportedPictureSizes()
             );
-            AspectRatio targetRatio = aspectRatios.last();
+            AspectRatio targetRatio = aspectRatios.size() > 0 ? aspectRatios.last() : null;
 
             Iterator<Size> descendingSizes = sizes.descendingIterator();
             Size size;
             while (descendingSizes.hasNext() && mPreviewSize == null) {
                 size = descendingSizes.next();
-                if (targetRatio.matches(size)) {
+                if (targetRatio == null || targetRatio.matches(size)) {
                     mPreviewSize = size;
                     break;
                 }
diff --git a/demo/build.gradle b/demo/build.gradle
index 6b2f6330..da4c5de3 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.flurgle.camerakit.demo"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {