Added exception handling, first set.