fix null struct exception

Change-Id: I9bf32849598c0725e2ce9a8a441bc41c6119c2bf