cid#1249675 Uncaught exception

Change-Id: I3923a6a83bfc0a35f5a5af86cfd0e5308cfda24c
cid#1249676 Uninitialized scalar field

Change-Id: I87df4e9c1d3f36afccf13aebfd95d1b4f3bfa655