updates for error handling for bailment