Bugfix: when no authentication, doesn't break