Add sentinel/gte check for amount