Issue #2522012 by phenaproxima, mikeryan, chx, benjy: Remove broken idlist handling, replace with more robust exception handling