diff --git a/aegisub/auto4_auto3.cpp b/aegisub/auto4_auto3.cpp
index 45068a767..857120b70 100644
--- a/aegisub/auto4_auto3.cpp
+++ b/aegisub/auto4_auto3.cpp
@@ -1320,6 +1320,14 @@ continue_invalid_option:
 	{
 		Destroy();
 
+#if 1
+		// HACK: Prevent auto3 scripts from ever loading
+		// This should be removed when things have been fixed
+		loaded = false;
+		name = GetFilename();
+		description = _T("Automation 3 scripts do currently not work in this version of Aegisub. Please use version 1.10 if you need to run this script.");
+#else
+
 		loaded = true;
 
 		try {
@@ -1415,6 +1423,7 @@ continue_invalid_option:
 			loaded = false;
 			throw;
 		}
+#endif
 	}
 
 	void Auto3Script::Destroy()
diff --git a/aegisub/auto4_lua.cpp b/aegisub/auto4_lua.cpp
index 49f44ed3b..83c3135ea 100644
--- a/aegisub/auto4_lua.cpp
+++ b/aegisub/auto4_lua.cpp
@@ -302,6 +302,9 @@ namespace Automation4 {
 			name = GetPrettyFilename();
 			description = e;
 		}
+		catch (Script *s) {
+			throw;
+		}
 		catch (...) {
 			Destroy();
 			loaded = false;
diff --git a/aegisub/auto4_lua_assfile.cpp b/aegisub/auto4_lua_assfile.cpp
index 2989917b4..50d95a57d 100644
--- a/aegisub/auto4_lua_assfile.cpp
+++ b/aegisub/auto4_lua_assfile.cpp
@@ -846,7 +846,8 @@ namespace Automation4 {
 						brackets_open = false;
 					}
 
-					break;}
+					break;
+				}
 
 			}