Sonar fixes : rethrow exceptions, better error info in exceptions
Sonar fixes: Method parameters, caught exceptions and foreach variables should not be reassigned