Some small changes.
If we can't serialize an object we should error, not fail silently.