Fix for login/hosts exceptions