Removed endless else validation clause