Fixed notice thrown with HHVM post-aba50a36f4ae523532368d56b551853c1107ac4e commit. Our code was faulty, a small reorganization fixed the issue and kept up compatible with future-release of HHVM 2.4.