Merge pull request #284 from Ocramius/DCOM-175

DCOM-175
Merge pull request #298 from fredrik-w/silence-e_notice

Silence E_NOTICE warning: "Undefined index".