diff --git a/src/main/java/org/ligi/passandroid/model/AndroidfileSystemPassStore.java b/src/main/java/org/ligi/passandroid/model/AndroidfileSystemPassStore.java
index 3bbd432d..0bc5737e 100644
--- a/src/main/java/org/ligi/passandroid/model/AndroidfileSystemPassStore.java
+++ b/src/main/java/org/ligi/passandroid/model/AndroidfileSystemPassStore.java
@@ -164,6 +164,9 @@ public class AndroidfileSystemPassStore implements PassStore {
 
     @Override
     public Optional<Passbook> getCurrentPass() {
+        if (actPass == null) {
+            return Optional.absent();
+        }
 
         return Optional.of(actPass);
     }