Add some error handling. Mainly just trying to remember where I was last time I managed to touch it
Cut down on some project dependencies that I haven't really had a chance to actually use.