diff --git a/src/it/junit/issue_147-featuresDirEmpty/pom.xml b/src/it/junit/issue_147-featuresDirEmpty/pom.xml
new file mode 100644
index 000000000..cc35e5a4e
--- /dev/null
+++ b/src/it/junit/issue_147-featuresDirEmpty/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.temyers.it</groupId>
+    <artifactId>issue_147</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <description>An IT verifying the behavior when feature dir doesn't exist or is empty</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <cucumber.version>1.2.2</cucumber.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>info.cukes</groupId>
+            <artifactId>cucumber-junit</artifactId>
+            <version>${cucumber.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>info.cukes</groupId>
+            <artifactId>cucumber-java</artifactId>
+            <version>${cucumber.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>@project.groupId@</groupId>
+                <artifactId>@project.artifactId@</artifactId>
+                <version>@project.version@</version>
+                <executions>
+                    <execution>
+                        <id>generateRunners</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>generateRunners</goal>
+                        </goals>
+                        <configuration>
+                            <glue>
+                                <package>foo</package>
+                                <package>bar</package>
+                            </glue>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <featuresDirectory>src/test/resources/features/emptyDir</featuresDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/it/junit/issue_147-featuresDirEmpty/src/test/resources/features/feature1.feature b/src/it/junit/issue_147-featuresDirEmpty/src/test/resources/features/feature1.feature
new file mode 100644
index 000000000..ffd271d54
--- /dev/null
+++ b/src/it/junit/issue_147-featuresDirEmpty/src/test/resources/features/feature1.feature
@@ -0,0 +1,6 @@
+Scenario: Features directory is empty
+  Given the features directory is empty
+  When I perform a build
+  Then a warning log message should be created
+  But the build should succeed
+  And no runners should be generated
\ No newline at end of file
diff --git a/src/it/junit/issue_147-featuresDirEmpty/verify.groovy b/src/it/junit/issue_147-featuresDirEmpty/verify.groovy
new file mode 100644
index 000000000..a479896ac
--- /dev/null
+++ b/src/it/junit/issue_147-featuresDirEmpty/verify.groovy
@@ -0,0 +1,10 @@
+def logFile = new File(basedir, 'build.log')
+content = logFile.text
+
+assert content.contains('Features directory is empty. No runners will be generated')
+
+
+def directory = new File(basedir, "target/generated-test-sources/cucumber")
+
+assert directory.isDirectory()
+assert directory.listFiles().length==0
\ No newline at end of file
diff --git a/src/it/junit/no-features-dir/invoker.properties b/src/it/junit/no-features-dir/invoker.properties
deleted file mode 100644
index 324b5fb99..000000000
--- a/src/it/junit/no-features-dir/invoker.properties
+++ /dev/null
@@ -1 +0,0 @@
-invoker.buildResult=failure
\ No newline at end of file
diff --git a/src/main/java/com/github/timm/cucumber/generate/GenerateRunnersMojo.java b/src/main/java/com/github/timm/cucumber/generate/GenerateRunnersMojo.java
index cf637418a..723391564 100644
--- a/src/main/java/com/github/timm/cucumber/generate/GenerateRunnersMojo.java
+++ b/src/main/java/com/github/timm/cucumber/generate/GenerateRunnersMojo.java
@@ -190,13 +190,20 @@ public class GenerateRunnersMojo extends AbstractMojo implements FileGeneratorCo
     public void execute() throws MojoExecutionException {
 
         if (!featuresDirectory.exists()) {
-            throw new MojoExecutionException("Features directory does not exist");
+            getLog().warn("Features directory does not exist");
+            return;
         }
 
+        createOutputDirIfRequired();
+
         final Collection<File> featureFiles = listFiles(featuresDirectory, new String[] {"feature"}, true);
-        final List<File> sortedFeatureFiles = new NameFileComparator().sort(new ArrayList<File>(featureFiles));
 
-        createOutputDirIfRequired();
+        if (featureFiles.isEmpty()) {
+            getLog().warn("Features directory is empty. No runners will be generated.");
+            return;
+        }
+
+        final List<File> sortedFeatureFiles = new NameFileComparator().sort(new ArrayList<File>(featureFiles));
 
         File packageDirectory = packageName == null
                 ? outputDirectory