Fix NPEs in blocking code
Merge pull request #802 from SamWhited/blockingfix

Fix NPEs in blocking code