Fix Coverity issue : 22384, 41860