fixed Null comparisions
fixed None comparisions