refactoring: eclipse 4.4 has stronger null checks