AccountStore can be null now + improved javadoc