removed not needed null check