diff --git a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
index c63e8adb7..ff60bcec8 100644
--- a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
@@ -43,7 +43,7 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa
     textures.clear()
     charMap.clear()
     textures += new DynamicFontRenderer.CharTexture(this)
-    activeTexture = textures(0)
+    activeTexture = textures.head
     generateChars(basicChars.toCharArray)
   }
 
@@ -69,9 +69,9 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa
   }
 
   override protected def drawChar(tx: Float, ty: Float, char: Char) {
-    val icon = charMap(char)
-    if (icon != null && icon.texture == activeTexture) {
-      icon.draw(tx, ty)
+    charMap.get(char) match {
+      case Some(icon) if icon.texture == activeTexture => icon.draw(tx, ty)
+      case _ =>
     }
   }