diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java
index c66bed415..70e7cb61d 100644
--- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java
+++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java
@@ -190,12 +190,14 @@ public String getDisplayName()
 			String part = parts[parts.length-1];
 			logDebug("parsing part " + part);
 			int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP);
+			String name = "";
 			if (indexOfSeparator < 0)
 			{
 				//seems invalid, but we're very generous here
 				displayName += "/"+part;
 			}
-			String name = part.substring(0, indexOfSeparator);
+			else
+				name = part.substring(0, indexOfSeparator);
 			try {
 				name = decode(name);
 			} catch (UnsupportedEncodingException e) {