1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp
index 2e26cf2e7..63bdb767b 100644
--- a/tools/mhmake/src/util.cpp
+++ b/tools/mhmake/src/util.cpp
@@ -470,7 +470,7 @@ loadedmakefile::loadedmakefile(const fileinfo *pDir, vector<string> &Args,const
           break;
         case 'C':
 #ifdef _DEBUG
-          if ((*ArgIt)[2]=='D')
+          if (ArgIt->size()>2 && (*ArgIt)[2]=='D')
           {
             g_CheckCircularDeps=true;
             break;
@@ -593,7 +593,7 @@ void loadedmakefile::LoadMakefile()
     cout << "Loading makefile "<<m_Makefile->GetQuotedFullFileName()<<endl;
   #endif
 
-  m_pParser=refptr<mhmakeparser>(new mhmakeparser(m_CommandLineVars));
+  m_pParser=refptr<mhmakefileparser>(new mhmakeparser(m_CommandLineVars));
 
   // Add the MAKECMDGOALS environment variable
   string MakeCmdGoals;