Add option to ignore null origin check