Added 404 handling, also oops