Some better exception handling for run command