diff --git a/resources/ext.uls.core.js b/resources/ext.uls.core.js
index 3240d59c..b1a2a9c1 100644
--- a/resources/ext.uls.core.js
+++ b/resources/ext.uls.core.js
@@ -6,6 +6,12 @@
 		this.options = $.extend( {}, $.fn.uls.defaults, options );
 		this.$menu = $( this.options.menu );
 		this.languages = this.$menu.data( 'languages' );
+		for ( var code in this.languages ) {
+			if ( $.uls.data.languages[code] === undefined ) {
+				console && console.log && console.log( "ULS: Unknown language " + code + "." );
+				delete this.languages[code];
+			}
+		}
 		this.shown = false;
 		this.render();
 		this.listen();
diff --git a/resources/ext.uls.lcd.js b/resources/ext.uls.lcd.js
index be821cfd..aa344f9e 100644
--- a/resources/ext.uls.lcd.js
+++ b/resources/ext.uls.lcd.js
@@ -28,15 +28,6 @@
 			var that = this,
 				language = $.uls.data.languages[langCode];
 
-			// TODO: This shouldn't happen.
-			// This currently happens with some special cases, such as qqq and
-			// some codes that are incorrectly used in Wikimedia projects for
-			// historical reasons.
-			if ( !language ) {
-				console.log( "Definition for " + langCode + " was not found in the language database." );
-				return;
-			}
-
 			var langName = that.options.languages[langCode];
 
 			var regions = [];