Bit of null pointer protection
Bump version to 0.21.0