Fix bug 2154 to select correct WIM connector class and prevent exceptions with missin...