Adds checks for missing fields