Merge "Fixing nullpointer error in genering error description" into main