Review code and implement error catching - with possible custom items
Review code and implement error catching - with possible custom items