Removed null reference possibility