Catch NotImplementedExceptions in RemoveInstance()

Fixes #1678