Fix potential null-deference bug.
Bump version to 0.2.1