Merge pull request #958 from TheBlueMatt/2021-06-fix-router-panic