DDBNEXT-74: Fixed errors found in code review DDBNEXT-53