Index: trunk/scripts/BuildProjectionDefinitions.java
===================================================================
--- trunk/scripts/BuildProjectionDefinitions.java	(revision 13598)
+++ trunk/scripts/BuildProjectionDefinitions.java	(revision 13599)
@@ -77,6 +77,9 @@
 
     static void initMap(String baseDir, String file, Map<String, ProjectionDefinition> map) throws IOException {
-        for (ProjectionDefinition pd : Projections.loadProjectionDefinitions(
-                baseDir + File.separator + PROJ_DIR + File.separator + file)) {
+        List<ProjectionDefinition> list = Projections.loadProjectionDefinitions(
+                baseDir + File.separator + PROJ_DIR + File.separator + file);
+        if (list.isEmpty())
+            throw new AssertionError("EPSG file seems corrupted");
+        for (ProjectionDefinition pd : list) {
             map.put(pd.code, pd);
         }
@@ -200,4 +203,7 @@
         }
         String proj = parameters.get(CustomProjection.Param.proj.key);
+        if (proj == null) {
+            result = false;
+        }
 
         // +proj=geocent is 3D (X,Y,Z) "projection" - this is not useful in
