improve exception handling
drwxr-xr-x - src