Removed redundant null check detected by the Eclipse compiler
Formatted code