Improved error handling
Merge branch 'alpha' of alpha.rootsmapper.com:alpha.rootsmapper.com into alpha