diff --git a/src/main.js b/src/main.js
index d735f2d4..d6588875 100644
--- a/src/main.js
+++ b/src/main.js
@@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc13.16.1',
+	major: 4, minor: 0, revision: 0, extra: '-rc13.16.2',
 	commit: __git_commit__,
 	build: __webpack_hash__,
 	toString: () =>
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index 33c4f90d..0916beac 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -130,6 +130,7 @@ export default class Chat extends Module {
 			ui: {
 				path: 'Chat > Appearance >> Rich Content',
 				title: 'Display rich content embeds for all links.',
+				description: '*Streamers: Please be aware that this is a potential vector for NSFW imagery via thumbnails, so be mindful when capturing chat with this enabled.*',
 				component: 'setting-check-box'
 			}
 		});
@@ -789,9 +790,12 @@ export default class Chat extends Module {
 		if ( ! msg || ! msg.user )
 			return 0;
 
-		if ( msg.user.login === msg.roomLogin || msg.badges.broadcaster )
+		if ( msg.user.login === msg.roomLogin || (msg.badges && msg.badges.broadcaster) )
 			return 4;
 
+		if ( ! msg.badges )
+			return 0;
+
 		if ( msg.badges.moderator )
 			return 3;