Check null
Update version number to 0.8.5