Added more robust OTR error handling