adding a check for that NPE to the multiscm path. This really isn't
where this should be fixed, but in the short term it get's people up and
running while I shave this particular yak in search of the root cause.