Fix eclipse null checks

These commits just fix places where Eclipse's "potential null pointer access" complained. In both cases the complaint seemed benign.