Fixed null being written to target driver