Merge "attempting to catch security exception to prevent full crash" into udc-qpr-dev