Clean up offering handling

Besides cleaning it up it should prevent this exception:
[#51567079]