Cause nil isn't null
Merge commit 'c0e9cc010c8918d54ed7752f5ab2be1d35620b51' into woahman
better method.