Fix build proceeding to packaging post-failure

[L1ghtmann]

Squash if good-to-go

Edit: there's some issue with the while loops always returning 1, so need to figure that out so it doesn't always bail so early before merging