Add some error handling
Merge branch 'development' of github.com:twoflowers/vUp into development