Add protection against missing value in returned data