Added null check plus stubs todo the same via hash and bitwise.