Fix several NPEs.
Update version to 2.0.5 (19).