Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Re-added extra null checks

Not sure why these were removed

Should help with jakimfett/Minechem#172

And now I'm off on holiday - have a good one fellas!
Merge pull request #193 from hilburn/1.7-update

Null checks