From bd2576f48cc28fa065c4555f7b4a99f72758aea6 Mon Sep 17 00:00:00 2001
From: Mike Pope <mpope@computer.org>
Date: Wed, 1 Feb 2017 20:29:29 +1030
Subject: [PATCH] Prevent NPE in CargoPanel.

---
 src/net/sf/freecol/client/gui/panel/CargoPanel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/client/gui/panel/CargoPanel.java b/src/net/sf/freecol/client/gui/panel/CargoPanel.java
index 1dc704ce5..91a86e876 100644
--- a/src/net/sf/freecol/client/gui/panel/CargoPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/CargoPanel.java
@@ -182,7 +182,7 @@ public class CargoPanel extends FreeColPanel
      */
     @Override
     public boolean accepts(Unit unit) {
-        return carrier.canAdd(unit);
+        return carrier != null && carrier.canAdd(unit);
     }
 
     /**
@@ -190,7 +190,7 @@ public class CargoPanel extends FreeColPanel
      */
     @Override
     public boolean accepts(Goods goods) {
-        return carrier.canAdd(goods);
+        return carrier != null && carrier.canAdd(goods);
     }
 
     /**