diff --git a/app/src/main/java/com/isolaatti/images/image_list/ui/ImagesFragment.kt b/app/src/main/java/com/isolaatti/images/image_list/ui/ImagesFragment.kt
index c5445f9..ce8385f 100644
--- a/app/src/main/java/com/isolaatti/images/image_list/ui/ImagesFragment.kt
+++ b/app/src/main/java/com/isolaatti/images/image_list/ui/ImagesFragment.kt
@@ -51,7 +51,9 @@ class ImagesFragment : Fragment() {
     }
 
     private val choosePictureLauncher = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) {
-        imageMakerLauncher.launch(it)
+        if(it != null) {
+            imageMakerLauncher.launch(it)
+        }
     }
 
     private val takePhotoLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) {
diff --git a/app/src/main/java/com/isolaatti/images/image_maker/ui/ImageMakerActivity.kt b/app/src/main/java/com/isolaatti/images/image_maker/ui/ImageMakerActivity.kt
index 84ef8ed..dbf88cd 100644
--- a/app/src/main/java/com/isolaatti/images/image_maker/ui/ImageMakerActivity.kt
+++ b/app/src/main/java/com/isolaatti/images/image_maker/ui/ImageMakerActivity.kt
@@ -1,13 +1,10 @@
 package com.isolaatti.images.image_maker.ui
 
 import android.app.Activity
-import android.content.ContentProvider
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.core.content.ContentProviderCompat
 import androidx.core.widget.doOnTextChanged
 import coil.load
 import com.isolaatti.R
@@ -59,8 +56,7 @@ class ImageMakerActivity : IsolaattiBaseActivity() {
                 }
                 is Resource.Success -> {
                     binding.progressBarLoading.visibility = View.GONE
-                    setResult(Activity.RESULT_OK)
-                    intent = Intent().putExtra(EXTRA_IMAGE, it.data)
+                    setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_IMAGE, it.data))
                     finish()
                 }
             }