Cleanup null check