Fix exception on unsupported attributes
Fix exception on unsupported attributes

jefflaplante/cli53,jefflaplante/cli53,branall1/cli53,Collaborne/cli53,ftahmed/cli53,Collaborne/cli53,branall1/cli53,branall1/cli53,ftahmed/cli53