add exception handling to fix 404s