general cleanup
fixed issue with 404s throwing exception