Error checking
Merge branch 'master' of https://github.com/anilane4/ECE4564_Final