Fixed legacy handler with 404 error