Add extra check in case the servicename was only hd...

In addition to the previous patch... it might happen....