[KROTE-208] Prevent undefined index warnings
Merge branch 'KROTE-208'