Temporary(Pt 2): fixing NullPointerExceptions