Fix eclipse nullness warnings around Class