Fixes to exception handling and downloads of >1000