FIX: cppcheck fix + unused param. fix.

FIX: Got rid of (false) cppcheck warning about invalid iterator.
FIX: Got rid of unused parameter warning in catch( ... ) statement.
Change-Id: Ibe2f136d102ada13cb87b340cec24e962f24d097
Merge topic 'rk-dbfix0'

62ad9ad FIX: cppcheck fix + unused param. fix.