Fixes #237
This fixes fatal errors in router and finder calling function that do not exist in J2.5 and are not used at this point.
Merge pull request #239 from bcordis/master

Pull to fixe some fatal errors in J2.5