Index: trunk/ppImage/src/ppImageOptions.c
===================================================================
--- trunk/ppImage/src/ppImageOptions.c	(revision 28043)
+++ trunk/ppImage/src/ppImageOptions.c	(revision 29833)
@@ -8,6 +8,6 @@
 {
     psFree(options->overscan);
-    psFree(options->nonLinearData);
-    psFree(options->nonLinearSource);
+    // psFree(options->nonLinearData);
+    // psFree(options->nonLinearSource);
 }
 
@@ -130,6 +130,5 @@
         psMetadataItem *dataItem = psMetadataLookup(recipe, "NONLIN.DATA");
         if (! dataItem) {
-            psLogMsg(__func__, PS_LOG_ERROR, "Non-linearity correction desired, but unable to "
-                     "find NONLIN.DATA in recipe %s.", RECIPE_NAME);
+            psLogMsg("ppImage", PS_LOG_ERROR, "Non-linearity correction desired, but unable to find NONLIN.DATA in recipe %s.", RECIPE_NAME);
             exit(EXIT_FAILURE);
         }
@@ -147,17 +146,12 @@
             // This is a menu; we need the key
           case PS_DATA_METADATA:
-            {
-                bool status;
-                options->nonLinearSource = psMetadataLookupStr(&status, recipe, "NONLIN.SOURCE");
-                if (! status || ! options->nonLinearSource) {
-                    psLogMsg(__func__, PS_LOG_ERROR, "Non-linearity correction desired, but unable to "
-                            "find NONLIN.SOURCE in recipe %s.", RECIPE_NAME);
-                    exit(EXIT_FAILURE);
-                }
-            }
+	    options->nonLinearSource = psMetadataLookupStr(&status, recipe, "NONLIN.SOURCE");
+	    if (! status || ! options->nonLinearSource) {
+		psLogMsg("ppImage", PS_LOG_ERROR, "Non-linearity correction desired, but unable to find NONLIN.SOURCE in recipe %s.", RECIPE_NAME);
+		exit(EXIT_FAILURE);
+	    }
             break;
           default:
-            psLogMsg(__func__, PS_LOG_ERROR, "Non-linearity correction desired, but "
-                    "NONLIN.DATA is of invalid type in recipe %s.", RECIPE_NAME);
+            psLogMsg("ppImage", PS_LOG_ERROR, "Non-linearity correction desired, but NONLIN.DATA is of invalid type in recipe %s.", RECIPE_NAME);
             exit(EXIT_FAILURE);
         }