maddeleine Adding underflow checks (#2322)