name change and small tweaks to handle exceptions