fixed None operator check