SONARJAVA-245 Improve the issue message and the FSM implementation