BugFix MessagerAspect (sonar bugs)