ARGUS-140: Fix for FindBugs reported issues