Prevent Undefined index Notice
Merge pull request #3326 from rvavruch/master

Prevent Undefined index Notice