Fix potential NullPointerExceptions in entity managers
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #248 from bbiletch/sbl-dev

Fix potential NullPointerExceptions in entity managers