Merge "Show error dialog only when 'ask first' is not set"