Prevent NPE from Java 8 lambdas
Merge pull request #1192 from smmckay/develop

Fixes #1192 - Prevent NPE from Java 8 lambdas