Properly rescue gem 404
Get build to stable state