Added exeptions and work on them