CLI exception handling#4

dedici wants to merge 2 commits into

MyLab-odyssey:masterMyLab-odyssey/ED4scan:masterfrom

dedici:masterdedici/ED4scan:masterCopy head branch name to clipboard