[bodhi] [Patch] Make the masher more robust