diff --git a/IDE/dist/IDE_CreateStable.bat b/IDE/dist/IDE_CreateStable.bat
index 3350474e..91873a8c 100644
--- a/IDE/dist/IDE_CreateStable.bat
+++ b/IDE/dist/IDE_CreateStable.bat
@@ -52,6 +52,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO FAILED
 BeefBuild_boot.exe -proddir=..\ -config=Release -platform=Win64
 IF %ERRORLEVEL% NEQ 0 GOTO FAILED
 
+@ECHO ---- Building BeefCon ----
+BeefBuild_d.exe -proddir=..\..\BeefTools\BeefCon -config=Release
+IF %ERRORLEVEL% NEQ 0 GOTO FAILED
+
 echo on
 
 @ECHO ---- Copying files ----
@@ -82,6 +86,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO FAILED
 copy Beef*Dbg*.* host
 IF %ERRORLEVEL% NEQ 0 GOTO FAILED
 copy userdict.txt host
+copy BeefCon.exe host
 @REM copy lib*.dll host
 copy Beefy2D.dll host
 copy BeefDbgVis.toml host
diff --git a/IDE/src/ui/ConsolePanel.bf b/IDE/src/ui/ConsolePanel.bf
index 69f83346..ca3675c4 100644
--- a/IDE/src/ui/ConsolePanel.bf
+++ b/IDE/src/ui/ConsolePanel.bf
@@ -173,7 +173,7 @@ class ConsolePanel : Panel
 					{
 						var cellInfo = mConsolePanel.mConsoleProvider.GetCell(i);
 
-						if ((i % numVisibleCols == 0) && (i != selStart))
+						if ((numVisibleCols > 0) && (i % numVisibleCols == 0) && (i != selStart))
 						{
 							// Start of new line
 							while ((str.Length > 0) && (str[str.Length - 1] == ' '))
@@ -275,6 +275,8 @@ class ConsolePanel : Panel
 
 		public static Position FromIndex(int index, int width)
 		{
+			if (width == 0)
+				return .((.)index, 0);
 			return .((.)(index % width), (.)(index / width));
 		}
 	}
diff --git a/IDE/src/util/ConsoleProvider.bf b/IDE/src/util/ConsoleProvider.bf
index 8cc93911..08cf3dc8 100644
--- a/IDE/src/util/ConsoleProvider.bf
+++ b/IDE/src/util/ConsoleProvider.bf
@@ -1008,6 +1008,8 @@ class BeefConConsoleProvider : ConsoleProvider
 
 	public override Cell GetCell(int col, int row)
 	{
+		if (mCells == null)
+			return default;
 		return mCells[row * mWidth + col];
 	}