Adds checks for empty fields