Cherry pick: Fixing panic in case object received is invalid (#6104)#6129

Merged

mhagen-vmware merged 1 commit intoreleases/1.2.0from cherry-pick/6104

Aug 28, 2017

+6-1

Commits on Aug 28, 2017

Fixing panic in case object received is invalid (#6104 )

hmahmood
authored and
mhagen-vmware
committed