Added support for Sonar plugin and replaced catch(Throwable) with
catch(Exception)