Index: wflow-py/Scripts/wflow_subcatch.py
===================================================================
diff -u -r7af3e755538562f152f1e3dfae6d763b345af342 -ra16df12d232fa447d21e743d8bf7e8f94158cb4b
--- wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision 7af3e755538562f152f1e3dfae6d763b345af342)
+++ wflow-py/Scripts/wflow_subcatch.py	(.../wflow_subcatch.py)	(revision a16df12d232fa447d21e743d8bf7e8f94158cb4b)
@@ -147,13 +147,18 @@
         allcmd = []
         for mfile in glob.glob(ddir + '/*.map'):
             x, y, data, FillVal = readMap(mfile,'PCRaster')
-            #try:
-            good = 1
-            xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal)
-            #except:
-            #good = 0
-            #print "Skipping: " + mfile
+            try:
+                good = 1
+                xn, yn, datan = cutMapById(data,subcatchmap,subcatch,x,y,FillVal)
+            except Exception,e:
+                good = 0
+                print "Skipping: " + mfile + " exception: " + str(e)
 
+            if xn == None:
+                good = 0
+                print "Skipping: " + mfile + " size does not match..."
+
+
             if good:
                 ofile = mfile.replace(caseName,caseNameNew)
                 if data.dtype == np.int32 or  data.dtype == np.uint8: