Adding back in RETURN_ON_ERR macros