Error handling
Merge branch 'master' of https://github.com/thomasjnoe/etch-a-sketch
afsdadsfasdfa