Removed SEGV.

Change-Id: I655f4bbbfb69e2243edd40b69f654b860242b596