Trying to remove findbug errors