Fix and tidy up error messages
Remove superfluous return statement