Handler: Put some asserts into item distribution and revert handling
to spot and prevent some errors currently happening...