diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
index aaa058ec2..e94d8efc2 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
@@ -439,6 +439,9 @@ public class GitActivity extends AppCompatActivity {
      * @param view
      */
     public void cloneRepository(View view) {
+        if (PasswordRepository.getRepository(null) == null) {
+            PasswordRepository.initialize(this);
+        }
         localDir = PasswordRepository.getWorkTree();
         hostname = ((EditText) findViewById(R.id.clone_uri)).getText().toString();
         port = ((EditText) findViewById(R.id.server_port)).getText().toString();
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
index aaca0cf1a..8fa08f48b 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
@@ -37,7 +37,7 @@ public class PasswordRepository {
      * @return the git repository
      */
     public static Repository getRepository(File localDir) {
-        if (repository == null) {
+        if (repository == null && localDir != null) {
             FileRepositoryBuilder builder = new FileRepositoryBuilder();
             try {
                 repository = builder.setGitDir(localDir)