diff --git a/src/eval_expr.y b/src/eval_expr.y
index 5198718f..80eb696f 100644
--- a/src/eval_expr.y
+++ b/src/eval_expr.y
@@ -274,10 +274,11 @@ static int kklex()
     while (c != 0 && isalnum(c) && i < length);
     str--;
     symbuf[i] = '\0';
-    s = getsym (symbuf);
+    s = getsym(symbuf);
     kklval.tptr = s;
     dbg(dbglev, "ylex: FNCT=%s\n", symbuf);
-    return FNCT;
+    if(s) return FNCT;
+    return 0; /* error : undefined identifier */
   }
   /* Any other character is a token by itself.        */
   return c;
diff --git a/xschem_library/devices/scope_ammeter.sym b/xschem_library/devices/scope_ammeter.sym
index c38fc591..804b5366 100644
--- a/xschem_library/devices/scope_ammeter.sym
+++ b/xschem_library/devices/scope_ammeter.sym
@@ -28,4 +28,4 @@ S {}
 E {}
 P 4 5 10 -20 10 -140 140 -140 140 -20 10 -20 {}
 T {@device} 12.5 -18.125 0 0 0.2 0.2 {layer=4}
-T {tcleval(@spice_get_node [xschem get_fqdevice @device ] )} 12.5 -139.375 0 0 0.15 0.15 {layer=15}
+T {tcleval(@spice_get_node [xschem get_fqdevice @device ] )} 12.5 -139.375 0 0 0.15 0.15 {layer=17}