mx2: add error propagation and remove warnings