Correctly handle no AZ in config on AWS fixes #436