Jonas: #27: prevent 'undefined index'