Fix NPE in account service