Handle cases where svc_enabled is called on a non-existing service
Minor code cleanups