scrutinizer issues fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Merge pull request #1239 from D-storm/scrutinizer

scrutinizer issues fix