Added check.
Merge branch 'dev_cake2.0' of https://github.com/aparticka/idbroker into dev_cake2.0