small update to exception handling