Removed potential nullness bug