Warehouse error message improved