slightly better error handling than before?, RT#10574