Added stronger checkout validation