if no error call with `null`
Merge remote-tracking branch 'Raynos/patch-2'