Added return statement to avoid further error messages