Fix nullness errors reported by Eclipse