Handling errors properly in new rebuild.