Fixes #6411 Return None for ec2 api endpoints that return 404