set operation exception only if error is actually set
Merge branch '1.1' of ssh://jrose@gerrit.intra:29418/org.openscada.atlantis into 1.1