Closed #59: 404 handling