Fix client relation removal-- Bug 986890

Handle case when FK or M2M field is None correctly