Wrapped errors

Don't merge just yet.