Version 1.2.1-SNAPSHOT
Fix NPE