Make order API tolerant to message