Gh384 checkout

send null if nothing to do on cancel