Correct handling of missing Project ID for Amazon