Merge "Catch exception to prevent crash." into tm-qpr-dev