Revert Freebase changes to throw exceptions sooner