NPE fixes for kmodule spring xml modifications.