COMP: variables weren't unused
COMP: fix unused catched exception references causing warnings
COMP: test main method signature
Merge branch 'bug-18113-small-code-fixes'