diff --git a/IDE/src/BuildContext.bf b/IDE/src/BuildContext.bf
index 0e7d29a6..3a17bf75 100644
--- a/IDE/src/BuildContext.bf
+++ b/IDE/src/BuildContext.bf
@@ -1009,7 +1009,7 @@ namespace IDE
 
 			if (hotProject == null)
 			{
-				switch (QueueProjectCustomBuildCommands(project, targetPath, runAfter ? options.mBuildOptions.mBuildCommandsOnRun : options.mBuildOptions.mBuildCommandsOnCompile, options.mBuildOptions.mPostBuildCmds))
+				switch (QueueProjectCustomBuildCommands(project, targetPath, runAfter ? options.mBuildOptions.mBuildCommandsOnRun : options.mBuildOptions.mBuildCommandsOnCompile, options.mBuildOptions.mPreBuildCmds))
 				{
 				case .NoCommands:
 				case .HadCommands:
@@ -1175,6 +1175,17 @@ namespace IDE
 					return false;
 			}
 
+			if (hotProject == null)
+			{
+				switch (QueueProjectCustomBuildCommands(project, targetPath, runAfter ? options.mBuildOptions.mBuildCommandsOnRun : options.mBuildOptions.mBuildCommandsOnCompile, options.mBuildOptions.mPostBuildCmds))
+				{
+				case .NoCommands:
+				case .HadCommands:
+				case .Failed:
+					completedCompileCmd.mFailed = true;
+				}
+			}
+
 		    return true;
 		}
 	}