Moved error messages to partial