[NGRINDER-524]
[NGRINDER-518] Fix the message
[NGRINDER-525] Fix checkstyle issues.