improved sonar ignores
fixed exception messages
Merge pull request #11 from tkrille/master

code cleanup