Don't crash system server

Change-Id: I6422017bf85f9751fe9bab3136e357b55e17c429
Fixes: 65374410
Test: make
2 files changed