Bug fix for 404 case.