GUI-129
added additional check so that unit tests pass