Merge pull request #564 from ChadKillingsworth/master

Fix NPE in CheckSideEffects