Prettied up formatting, added additional error prevention

![selfie-0](http://i.imgur.com/hFF7Awi.gif)