diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImageFileLoader.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImageFileLoader.java
index 0c4f0bd6..889c5dd1 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImageFileLoader.java
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImageFileLoader.java
@@ -87,7 +87,7 @@ public void run() {
 
                     File file = makeSafeFile(path);
                     if (file != null && file.exists()) {
-                        if(exlucedImages != null && exlucedImages.contains(file))
+                        if (exlucedImages != null && exlucedImages.contains(file))
                             continue;
 
                         Image image = new Image(id, name, path);
diff --git a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java
index e7ceb73f..62e733b0 100644
--- a/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java
+++ b/imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerActivity.java
@@ -82,6 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         /* This should not happen */
         Intent intent = getIntent();
         if (intent == null || intent.getExtras() == null) {
+            IpLogger.getInstance().e("This should not happen. Please open an issue!");
             finish();
             return;
         }
@@ -115,6 +116,9 @@ private ImagePickerConfig getImagePickerConfig() {
         if (config == null) {
             Intent intent = getIntent();
             Bundle bundle = intent.getExtras();
+            if (bundle == null) {
+                throw new IllegalStateException("This should not happen. Please open an issue!");
+            }
             config = bundle.getParcelable(ImagePickerConfig.class.getSimpleName());
         }
         return config;