Added null-checks in OrderAction