adding guard in the test
Merge branch 'develop' into hotfix/issue-108-broker-thread-safety
really adding guard
Merge branch 'develop' into hotfix/issue-108-broker-thread-safety