#58 Fix undefined index warning messages