enhance error handling

enhance error handling, remove image add to everntoe