Added better error messages to forms