#734 - don't send messages with bogus id values
Merge branch 'master' into issue-653
remove possible NPE - from Govert