Updated: Throw exception if no NMS support

Also, cleanup.