From 0129a9065d6331c8469e0c75292bf79411350fe7 Mon Sep 17 00:00:00 2001
From: Sebastian Zhorel <sebastian-zhorel@email.de>
Date: Sun, 2 Aug 2015 14:31:58 +0200
Subject: [PATCH] Catch NPE from broken Region earlier to prevent game freeze,
 BR#2885

---
 src/net/sf/freecol/client/gui/MapViewer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/net/sf/freecol/client/gui/MapViewer.java b/src/net/sf/freecol/client/gui/MapViewer.java
index 977b7c718..f80b146e5 100644
--- a/src/net/sf/freecol/client/gui/MapViewer.java
+++ b/src/net/sf/freecol/client/gui/MapViewer.java
@@ -47,6 +47,7 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.ImageIcon;
@@ -1904,7 +1905,11 @@ public final class MapViewer {
                     && tile.getRegion().getName() == null) {
                     text = tile.getRegion().getSuffix();
                 } else {
-                    text = Messages.message(tile.getRegion().getLabel());
+                    try {
+                        text = Messages.message(tile.getRegion().getLabel());
+                    } catch(NullPointerException e) {
+                        logger.log(Level.WARNING, "Uninitialized Region"/*, e*/);
+                    }
                 }
             }
             displayTerritorialBorders(g, tile, BorderType.REGION, true);