Fixed exception in viewer
refs #750
Merge branch 'master' of ssh://git.braintech.pl/pisak