Checkstyle - possible NPE and unneeded predicates removed
fixed test failures
Merge pull request #804 from Unicon/checkstyle-useless-predicates

Checkstyle - possible NPE and unneeded predicates removed