Added exception if org slection fails