Modify exception conditions
Merge https://github.com/a1sams1a/DSProject1