Fixed one 'incorrect num of parms' error; protected against a few cases of bad data behavior.