Merge "BUG-642: get rid of sneakyThrow"