Fix NPE when checking out service