Bugfix: unintentional masking of ValueError