Added error handling
Merge pull request #1 from scottksmith95/master

Added error handling - Beautiful. Thank you!