Fixes against NPEs
Merge branch 'master' of https://github.com/spring-projects/spring-ide.git