Added early check of origin value.