Added exception to Map