Trailers: Improved error handling