"Fixed small NullPointerException bug"