ADDED SOME ERROR SHIT
Merge pull request #1 from robotmayo/master

ADDED SOME ERROR SHIT