Importing rev 45196 from 1.4 - don't kill dialog for a bad response