Feature/loop round 3

In my latest pull I moved the exception handling to the logout method, so you can remove the try-except here