Bugfix for issues #730 & #751
Merge pull request #787 from alterm4nn/exhibitcheck

Bugfix for issues #730 & #751