Changed the user check to continue instead of return