Working well, now need to avoid errors on empty hand