Bug fix
Make error messages DRY