I "think" this is more correct... but hard to say until we have a test set up so that everything get's runtime error tested.