Simpligy some code, stop hiding an NPE.