Merge branch 'bugfix/7599_ConfusingGetEI_ErrorMessage' into develop