Better behavior when builder faces an error
Force unpack was too excessive in its cleaning