[Master corrupted on JAN 03] Proceed with updating only if search successful

The master branch is corrupted, 

the missing PR's are

1) PR #244 ( again brought in by PR #249)
2) PR #246

looks like updates where forced pushed.


So, Me raising this PR again.