Fixed bug with fields not present throwing an error