Error handling improvements
Error handling improvements

matteofigus/oc,NapoleanReigns/oc,federicomaffei/oc,federicomaffei/oc,andyroyle/oc,andyroyle/oc,NapoleanReigns/oc,matteofigus/oc,opentable/oc,opentable/oc