Temporary(Pt 1): fixing NullPointerExceptions