Added Better Error Handling to the Common Framework