Add logging and set execute timeout