- Fix NullPointer bug.