1 3 stable fix nil on run callbacks

This is mostly a cherry-pick of https://github.com/spree/spree/commit/1810ab6567d97e4491b68f8c767baf439d619631 to 1-3-stable

Realized in #3612 that I forgot to submit a backport fix to 1-3-stable