Started to add exceptions