Add back some checks for gc!=NULL.
release-2.x.y
2014-01-18, Mark Doliner