SI-7164 - Removing NotImplementedError as Fatal from s.u.c.NonFatal