Fix a couple NPEs

Still wokring on 1 more, but okay to merge this while working

Change-Id: I9205189da0cbfaf5a8ed646023671fa067125395