Fixes part 2 of #352 - setIncludeSources always throw NPE