Feature/catch execution error