VE-1265 Adding additional check and logging