diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index edc11fc..867d049 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.0.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
diff --git a/core b/core
index 882d083..a45001a 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 882d083d77a86d23a7bd27f63f1d01af09ce93c5
+Subproject commit a45001aa3926f57d9d457e7c12800b264010b5dd
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 300f6ae..28104f0 100644
Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index d8160e2..5370ffd 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -8,4 +8,4 @@ bld.javaOptions=
 bld.javacOptions=
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
 bld.sourceDirectories=core/src/bld/java
-bld.version=2.0.0
\ No newline at end of file
+bld.version=2.0.1
\ No newline at end of file
diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java
index 02a1b8e..73a9cc0 100644
--- a/src/main/java/rife/bld/wrapper/Wrapper.java
+++ b/src/main/java/rife/bld/wrapper/Wrapper.java
@@ -383,7 +383,8 @@ public class Wrapper {
             }
             currentDir_ = new File(current_file.getParent());
 
-            if (BUILD_ARGUMENT.equals(arguments.get(0))) {
+            if (!arguments.isEmpty() &&
+                BUILD_ARGUMENT.equals(arguments.get(0))) {
                 launchMode_ = LaunchMode.Build;
                 arguments.remove(0);
             }
diff --git a/src/main/resources/BLD_VERSION b/src/main/resources/BLD_VERSION
index 359a5b9..10bf840 100644
--- a/src/main/resources/BLD_VERSION
+++ b/src/main/resources/BLD_VERSION
@@ -1 +1 @@
-2.0.0
\ No newline at end of file
+2.0.1
\ No newline at end of file