diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java
index 1c3e198113..7372614c76 100644
--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java
+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java
@@ -93,6 +93,7 @@ public class CraftMapCanvas implements MapCanvas {
                     }
                     catch (NumberFormatException ex) {}
                 }
+                throw new IllegalArgumentException("Text contains unterminated color string");
             }
 
             CharacterSprite sprite = font.getChar(text.charAt(i));
diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
index 625ef96b4a..b951bfda3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 
 import net.minecraft.server.WorldMap;
 
@@ -143,7 +144,11 @@ public final class CraftMapView implements MapView {
             }
 
             canvas.setBase(render.buffer);
-            renderer.render(this, canvas, player);
+            try {
+                renderer.render(this, canvas, player);
+            } catch (Throwable ex) {
+                Bukkit.getLogger().log(Level.SEVERE, "Could not render map using renderer " + renderer.getClass().getName(), ex);
+            }
 
             byte[] buf = canvas.getBuffer();
             for (int i = 0; i < buf.length; ++i) {