remove some nullness warnings in Eclipse