Handle Gvc more gracefully