Commit 5935a1dc0b45d1256c81b214222125b47e3db345

ariza 2020-03-03T12:12:51

add pop_discard() calls to errror returns