Properly handle errors on base