CID-1254843: var name changed to saolve c&p issue
CID-1254841 removed unused var
CID-1254842 use boxed constant instead of true
CID-1254838 catch individual exceptions types