Reinstate the try..except for no repo