Merge "Remove pointless exception supression." into jb-mr1-dev