Does this still throw?  I thought jhugg cleaned up enough that this didn't need to be wrapped any more?  Is this just because of a merge conflict or did you actually run across an issue here?