added check for fields incomplete/not set