Bunch of jakes suggestions: Renaming Creation of a general Safety class which can check items and throw exceptions if specific issues come up Integrate item safety class Keep assert stuff here as well