Add message
Fix npe
Fix concurrent exception
Fix bug
Fix NPE