Fixed more edge case issues.
Merge branch 'develop' of https://github.com/WASdev/sample.rtcomm.helpdesk into develop