FOP-2221: Make overflow messages easier to read and fix wrong/ missing messages; applied second patch by Simon Steiner.