Some additional null checking

src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java

@@ -376,7 +376,12 @@ public class GamsRasterOptimiser {
 
 				IrrigationItem irrigItem = irrigRaster.get(key);
 
-				int clusterId = mapping.get(key).getInt();
+				IntegerRasterItem clusterItem = mapping.get(key);
+				if (clusterItem == null) {
+					LogWriter.printlnError("Warning: GamsRasterOptimiser no cluster for key" + key);
+					continue;
+				}
+				int clusterId = clusterItem.getInt();
 
 				YieldResponsesItem aggYResp = aggregatedYields.lazyGet(clusterId);
 				LandUseItem aggLandUse = aggregatedAreas.lazyGet(clusterId);

src/ac/ed/lurg/demand/AbstractDemandManager.java

@@ -41,8 +41,14 @@ public abstract class AbstractDemandManager implements Serializable {
 
 		for (SingleCountry c : compositeCountryManager.getAllForCompositeCountry(cc)) {
 
-			foodDemandMap = getFoodDemand(c, year, prices, outputGamsDemand);
-
+			try {
+				foodDemandMap = getFoodDemand(c, year, prices, outputGamsDemand);
+			} catch (Exception e) {
+				LogWriter.printlnError("Error: AbstractDemandManager not including " + c + " due to exception");
+				LogWriter.print(e);
+				continue;
+			}
+				
 			for (CommodityType commodity : CommodityType.getAllFoodItems()) {
 
 				Double food = foodDemandMap.get(commodity);