Fixed remaining check and return statement.