diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 98ceba0..e59cf46 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -31,7 +31,9 @@ class EditActivity : AppCompatActivity() {
         okButton.setOnClickListener {
             val intent = Intent()
             intent.putExtra("caption", captionEditText.text.toString())
-            intent.putExtra("uri", currentUri)
+            if (currentUri != null) {
+                intent.putExtra("uri", currentUri)
+            }
             setResult(Activity.RESULT_OK, intent)
             finish()
         }
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index a937119..2cb48cc 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -80,9 +80,14 @@ class MainActivity : AppCompatActivity() {
 
         if (requestCode == 1234 && resultCode == Activity.RESULT_OK && data != null) {
             val btn = findViewById<TextView>(R.id.text_view_button)
-            btn.setText(data.getStringExtra("caption"))
+            val caption = data.getStringExtra("caption")
+            if (caption != null) {
+                btn.setText(caption)
+            }
             currentUri = data.getParcelableExtra<Uri>("uri")
-            grantUriPermission(getPackageName(), currentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            if (currentUri != null) {
+                grantUriPermission(getPackageName(), currentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
         }
     }
 }
\ No newline at end of file