Fixed exception thrown on login.
Merge branch 'develop' of https://github.com/leerbedrijflisa/kiwi into develop