NHA: Removed redundant if
NHA: Enhance Service messages