diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index a28b86f551d..db2c3f373f1 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -94,8 +94,9 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
 	continue;
       }
       break;
-    case Optional: break;
-    default: cerr << "Bad ValueMask flag! CommandLine usage error!\n"; abort();
+    case ValueOptional: break;
+    default: cerr << "Bad ValueMask flag! CommandLine usage error:" 
+		  << Handler->getValueExpectedFlag() << endl; abort();
     }
 
     // Run the handler now!
diff --git a/support/lib/Support/CommandLine.cpp b/support/lib/Support/CommandLine.cpp
index a28b86f551d..db2c3f373f1 100644
--- a/support/lib/Support/CommandLine.cpp
+++ b/support/lib/Support/CommandLine.cpp
@@ -94,8 +94,9 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
 	continue;
       }
       break;
-    case Optional: break;
-    default: cerr << "Bad ValueMask flag! CommandLine usage error!\n"; abort();
+    case ValueOptional: break;
+    default: cerr << "Bad ValueMask flag! CommandLine usage error:" 
+		  << Handler->getValueExpectedFlag() << endl; abort();
     }
 
     // Run the handler now!