Handle Parcelable and fix error message. Fixes #3