cleanup
extract createErrorMessage (IDEA-CR-1104)
removed identical branch
NotNull & typos