Merge "Fixed exception handling" into release/2019.2.0