Better exception handling, clientNameDict