Fixed exception in method deleteMessage
Merge branch 'feature-safe-remove-branch-hotfix' into develop