diff --git a/android/src/org/ppsspp/ppsspp/CameraHelper.java b/android/src/org/ppsspp/ppsspp/CameraHelper.java
index f4b712d72f..642504f038 100644
--- a/android/src/org/ppsspp/ppsspp/CameraHelper.java
+++ b/android/src/org/ppsspp/ppsspp/CameraHelper.java
@@ -218,6 +218,10 @@ class CameraHelper {
 				}
 			}
 
+			if (mPreviewSize == null) {
+				throw new Exception("Couldn't find a viable preview size");
+			}
+
 			Log.d(TAG, "setPreviewSize(" + mPreviewSize.width + ", " + mPreviewSize.height + ")");
 			param.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
 
@@ -239,7 +243,7 @@ class CameraHelper {
 			mCamera.setPreviewCallback(mPreviewCallback);
 			mCamera.startPreview();
 			mIsCameraRunning = true;
-		} catch (IOException e) {
+		} catch (Exception e) {
 			Log.e(TAG, "Cannot start camera: " + e.toString());
 		}
 	}