added error handler
added error handling
fixed merge conflict
fixed core