Be less safe, let NULL-POINTER-P raise an error.
Fix callback return values.
remove stash.patch