#8 Service heartbeat can be reset

Also fixed unknown services NPE