Change logic for throw NOT SUPPORTED exception properly