Added null check re 'that' sequence of Patch