Request from issue #1132. Now in the core.
Undefined index. Oy.
#1138
Signed-off-by:KProvance <kevin.provance@gmail.com>