Fix fatal (thanks Chad!)

Change-Id: I5c315ed2f29afb992014e2081ad2ce3d93d67aa1
Merge "Fix fatal (thanks Chad!)"