Added Error Handling back in

Added in some invalid service name testing