Fix errors thrown if logged out
Rename this to correct name