Apollo: Catch NullPointerExceptions

Change-Id: I23c0e74783f43bfc067c66d694070e9f907f0d8c