[BUGFIX] Check type of assumed fields before attempting to set default value