handle errors for #26