Fix NPE
Faster class splitting
Comment and remove typo
Merge pull request #49 from orbeon/master

NPE fix and fast class splitting