diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
index f5a626b03f7..a92d64b048a 100644
--- a/code/modules/goonchat/browserOutput.dm
+++ b/code/modules/goonchat/browserOutput.dm
@@ -46,6 +46,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
 	var/static/list/chatResources = list(
 		"jquery.min.js"            = 'code/modules/html_interface/js/jquery.min.js',
 		"json2.min.js"             = 'code/modules/goonchat/browserassets/js/json2.min.js',
+		"errorHandler.js"          = 'code/modules/goonchat/browserassets/js/errorHandler.js',
 		"browserOutput.js"         = 'code/modules/goonchat/browserassets/js/browserOutput.js',
 		"fontawesome-webfont.eot"  = 'tgui/assets/fonts/fontawesome-webfont.eot',
 		"fontawesome-webfont.svg"  = 'tgui/assets/fonts/fontawesome-webfont.svg',
diff --git a/code/modules/goonchat/browserassets/html/browserOutput.html b/code/modules/goonchat/browserassets/html/browserOutput.html
index 74212fd8156..ea32f79da11 100644
--- a/code/modules/goonchat/browserassets/html/browserOutput.html
+++ b/code/modules/goonchat/browserassets/html/browserOutput.html
@@ -6,6 +6,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<link rel="stylesheet" type="text/css" href="font-awesome.css" />
 	<link rel="stylesheet" type="text/css" href="browserOutput.css" />
+	<script type="text/javascript" src="errorHandler.js"></script>
 	<script type="text/javascript" src="jquery.min.js"></script>
 	<script type="text/javascript" src="json2.min.js"></script>
 </head>
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
index b47c22ecfc1..a89a4039db6 100644
--- a/code/modules/goonchat/browserassets/js/browserOutput.js
+++ b/code/modules/goonchat/browserassets/js/browserOutput.js
@@ -1,3 +1,4 @@
+
 /*****************************************
 *
 * FUNCTION AND VAR DECLARATIONS
@@ -5,6 +6,7 @@
 ******************************************/
 
 //DEBUG STUFF
+var triggerError = attachErrorHandler('chatDebug', true);
 var escaper = encodeURIComponent || escape;
 var decoder = decodeURIComponent || unescape;
 window.onerror = function(msg, url, line, col, error) {
diff --git a/tgstation.dme b/tgstation.dme
index 62f88688c05..726b46f5663 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1308,6 +1308,7 @@
 #include "code\modules\games\cards.dm"
 #include "code\modules\games\cas.dm"
 #include "code\modules\goonchat\browserOutput.dm"
+#include "code\modules\goonchat\jsErrorHandler.dm"
 #include "code\modules\holiday\easter.dm"
 #include "code\modules\holiday\holidays.dm"
 #include "code\modules\holodeck\area_copy.dm"