Still fixing NullPointerExceptions.