Remove the NullComponent, and check constructor name instead