Resolves issue #217 for route crashing the app