Fix cases where some keys in the response may not exist