Fix diagnostic information when there is no subscriber
Merge pull request #412 from garaemon/fix-diagnostic-information

Fix diagnostic information when there is no subscriber