minor error checking tweak. ID-171