Raise NotImplementedError instead of NotImplemented

Change-Id: I1a01a5ad60d0eff1609d422578b38fb19923746f