diff --git a/v2/build/build-request.jam b/v2/build/build-request.jam
index 8a1f7b0eb..943c224ae 100644
--- a/v2/build/build-request.jam
+++ b/v2/build/build-request.jam
@@ -153,7 +153,7 @@ rule from-command-line ( command-line * )
                 properties += [ convert-command-line-element $(e) :
                     $(feature-space) ] ;
             }
-            else
+            else if $(e)
             {
                 targets += $(e) ;
             }
diff --git a/v2/build/build_request.py b/v2/build/build_request.py
index cc9f2400a..e149ab894 100644
--- a/v2/build/build_request.py
+++ b/v2/build/build_request.py
@@ -114,7 +114,7 @@ def from_command_line(command_line):
             # consists of implicit feature values.
             if e.find("=") != -1 or looks_like_implicit_value(e.split("/")[0]):                
                 properties += convert_command_line_element(e)
-            else:
+            else if e:
                 targets.append(e)
 
     return [targets, properties]