Fix up exceptions in interceptors/messaging in endpoint layers