fixed rootcommand registration and NPE on datastore disable