Revert "Fixes potential dereference of null pointer"

This reverts commit 568767e5bd85ddbad39aa5dbf56f8e51c6eb846c.
Fixes a spec bug and bumps version to v0.2.1