diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index a3e01370a3f7019c4ba51d6079ea9657a1f6df04..cfbfe3fb82bc46b21909d5ce5b263813fe1e7161 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -1202,7 +1202,6 @@ int C_DECL main(int argc, char* argv[])
 EShLanguage FindLanguage(const std::string& name, bool parseStageName)
 {
     std::string stage_name;
-
     if (shaderStageName) {
         stage_name = shaderStageName;
     } else if (parseStageName) {
@@ -1225,6 +1224,8 @@ EShLanguage FindLanguage(const std::string& name, bool parseStageName)
             usage();
             return EShLangVertex;
         }
+    } else {
+      stage_name = name;
     }
     if (stage_name == "vert")
         return EShLangVertex;