diff --git a/src/table.c b/src/table.c
index 7525c79c40f29fb082f23fb4dba73815a71d49f9..82a6d90fc0678f8c3610862f3ceacc8acd8665f6 100644
--- a/src/table.c
+++ b/src/table.c
@@ -825,27 +825,21 @@ int tableInqParCode(int tableID, char *varname, int *code)
 
 int tableInqParName(int tableID, int code, char *varname)
 {
-  int item, npars;
-  int err = 0;
-
-  npars = parTable[tableID].npars;
+  int err = 1;
 
-  if ( tableID == UNDEFID )
-    {
-      err = 1;
-    }
-  else
+  if ( tableID != UNDEFID )
     {
-      for ( item = 0; item < npars; item++ )
+      int npars = parTable[tableID].npars;
+      for ( int item = 0; item < npars; item++ )
 	{
 	  if ( parTable[tableID].pars[item].id == code )
 	    {
 	      if ( parTable[tableID].pars[item].name )
 		strcpy(varname, parTable[tableID].pars[item].name);     //FIXME: This may overrun the supplied buffer!
+              err = 0;
 	      break;
 	    }
 	}
-      if ( item == npars ) err = 1;
     }
 
   return (err);