diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
index af87d842..f5d64e9e 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
@@ -437,6 +437,8 @@ public class FolderActivity extends SyncthingActivity
                 }
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
                     mFolderUri != null &&
+                    mFolder != null &&
+                    mFolder.type != null &&
                     mFolder.type.equals(Constants.FOLDER_TYPE_SEND_ONLY)) {
                     /**
                      * Normally, syncthing takes care of creating the ".stfolder" marker.