diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cd73f30..3fb3fea1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # PhotoEditor SDK - Changelog
 
-## v8.0.1
+## v8.0.2
+
+### Fixed
+* `IllegalArgumentException` while exporting a video on some devices.
+
+
+## ~~v8.0.1~~ (Deprecated version, don't use it!)
 
 ### Fixed
 * `KotlinNullPointerException` if using a relative export uri.
diff --git a/README.md b/README.md
index 631a4359..a2691bd1 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
     <img src="https://img.shields.io/badge/platform-android-2DC25C.svg?style=flat">
   </a>
   <a href="https://artifactory.img.ly/artifactory/imgly/ly/img/android/pesdk/">
-    <img src="https://img.shields.io/badge/VERSION-8.0.1-007ec6.svg?style=flat" alt="Maven">
+    <img src="https://img.shields.io/badge/VERSION-8.0.2-007ec6.svg?style=flat" alt="Maven">
   </a>
   <a href="http://twitter.com/PhotoEditorSDK">
     <img src="https://img.shields.io/badge/twitter-@PhotoEditorSDK-8646E2.svg?style=flat" alt="Twitter">
@@ -126,7 +126,7 @@ buildscript {
         maven { url "https://artifactory.img.ly/artifactory/imgly" }
     }
     dependencies {
-        classpath 'ly.img.android.pesdk:plugin:8.0.1'
+        classpath 'ly.img.android.pesdk:plugin:8.0.2'
     }
 }
 
diff --git a/app/src/main/java/com/photoeditorsdk/android/app/KEditorDemoActivity.kt b/app/src/main/java/com/photoeditorsdk/android/app/KEditorDemoActivity.kt
index ef6ccd04..7bcf0bae 100644
--- a/app/src/main/java/com/photoeditorsdk/android/app/KEditorDemoActivity.kt
+++ b/app/src/main/java/com/photoeditorsdk/android/app/KEditorDemoActivity.kt
@@ -99,8 +99,15 @@ class KEditorDemoActivity : Activity(), PermissionRequest.Response {
             intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
         }
 
-        startActivityForResult(intent, GALLERY_RESULT)
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || intent.resolveActivity(packageManager) != null) {
+            startActivityForResult(intent, GALLERY_RESULT)
+        } else {
+            Toast.makeText(
+                this,
+                "No Gallery APP installed",
+                Toast.LENGTH_LONG
+            ).show()
+        }
     }
 
     fun openEditor(inputImage: Uri?) {
@@ -123,7 +130,7 @@ class KEditorDemoActivity : Activity(), PermissionRequest.Response {
 
         if (resultCode == RESULT_OK && requestCode == GALLERY_RESULT) {
             // Open Editor with some uri in this case with an image selected from the system gallery.
-            val selectedImage = intent?.data
+            val selectedImage = intent.data
             if (selectedImage != null) {
                 openEditor(selectedImage)
             }
diff --git a/build.gradle b/build.gradle
index 17e736d0..3909609e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.4.10'
-    ext.pesdk_version = '8.0.1' // Insert the latest SDK version here. You will find it here https://github.com/imgly/pesdk-android-demo/releases
+    ext.pesdk_version = '8.0.2' // Insert the latest SDK version here. You will find it here https://github.com/imgly/pesdk-android-demo/releases
     repositories {
         google()
         jcenter()