Added a try catch to catch errors
Merge branch 'master' of https://github.com/bootsman123/ahci-group2