Better handling of empty deck's