added valueerror to excepts
Merge branch 'master' of https://github.com/claesenm/optunity