code cleanup

improved sonar ignores
fixed exception messages