Fix NullPointerExceptions

Change-Id: Ia92f5973beb2d7187f6e04c9f5caf561482576f3
1 file changed