Hacky fixes for a few crashes from the developer console

Change-Id: Ic77deed8ece84074c97b3e915e53f3e7496f6850