return early on error, stop using isNull() when it is an empty block - better than #513
Merge pull request #517 from phated/master

return early on error, stop using isNull() when it is an empty block - better than #513