Added a simple check before executing a service