Add useful context to various error messages