Merge "The reset() should not throw exceptions"