diff --git a/src/main/java/pl/project13/maven/git/JGitProvider.java b/src/main/java/pl/project13/maven/git/JGitProvider.java
index 37a4a086..5564632b 100644
--- a/src/main/java/pl/project13/maven/git/JGitProvider.java
+++ b/src/main/java/pl/project13/maven/git/JGitProvider.java
@@ -216,7 +216,9 @@ protected String getTags() throws MojoExecutionException {
 
   @Override
   protected void finalCleanUp() {
-    revWalk.dispose();
+    if (revWalk != null) {
+      revWalk.dispose();
+    }
   }