Modify Splitter.java: index can be null now