Added 404 Not Found to handlers