[MR] {bugfix} prevent illegalstateexception
Merge branch 'master' into loadContacts