corrected runtime errors that occured after merging master into showHierarchy
corrected runtime errors that occured after merging master into showHierarchy

IPS-LMU/EMU-webApp,IPS-LMU/EMU-webApp,IPS-LMU/EMU-webApp,IPS-LMU/EMU-webApp,IPS-LMU/EMU-webApp,IPS-LMU/EMU-webApp