Fix use of return instead of else

Fix use of return instead of else, allows code after the if statement to
still be ran