Moved capture to be call if the driver isn't null