Added exception handling concept