PlaceHistoryMapperGenerator failing error

After a big git merge with conflicting files, our project doesn't gwt-compile anymore. It gives this error which I don't remember seeing before:

[INFO]    Computing all possible rebind results for 'com.mycomp.HistoryMapper'

[INFO]       Rebinding com.mycomp.HistoryMapper

[INFO]          Invoking generator com.google.gwt.place.rebind.PlaceHistoryMapperGenerator

[INFO]             [ERROR] Generator 'com.google.gwt.place.rebind.PlaceHistoryMapperGenerator' threw an exception while rebinding 'com.mycomp.HistoryMapper'

[INFO] java.lang.NullPointerException

[INFO]  at com.google.gwt.place.rebind.PlaceHistoryMapperGenerator.writeGetPrefixAndToken(PlaceHistoryMapperGenerator.java:122)

I haven't found any related info here or elsewhere online. There's the possibility of course that one or more of our files were corrupted during the merge, but there's nothing obvious that is wrong since there's no errors highlighted in the IDE. Regular (non-gwt) compile works, and I manually checked all conflicting files. The only related reported issue I've found is this one:

https://code.google.com/p/google-web-toolkit/issues/detail?id=8036

but I don't think that issue fails during gwt compilation. Given the class where the NPE occurs, I suspect it has something to do with my Places/Tokenizers, but turning on DEGUG logLevel doesn't provide more info. Does anyone have a clue seeing the above snippet?

--
You received this message because you are subscribed to the Google Groups "Google Web Toolkit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to google-web-toolkit+unsubscribe@googlegroups.com.
To post to this group, send email to google-web-toolkit@googlegroups.com.
Visit this group at http://groups.google.com/group/google-web-toolkit.
For more options, visit https://groups.google.com/d/optout.