Good idea @rxin, I can send another PR actually addressing this kind of check.