remove eclipse warnings about potential null pointer