Dialogue improvements, Error handling