Fix for test failure due to null pointer from missing short name service stub