Fail gracefully, and fix to m2m_clear