Fix a few potential crashes

Change-Id: Icb71cb07495406be756e195f2578b6e3aa8b1163
3 files changed