Fixed NPE
Tweaked the service and handle