avoiding npe + checkstyle
4 files changed