Fix exceptions and dataproviders