Catch ValueError
Merge branch 'master' into upload