I checked this out and the patch fixes the error. Proceeding to apply in dev ...