Fix for Struct and trow error when field not found