Removed whitespace before checking
Added validation for forename
Simplified to single error format