Moved core check inside of the non-extension module routing.