Add error handling
Merge branch 'master' of m13253/uredirect-py into m13253-master