Introduced more robust handling of DB errors DBs without products
Merge remote-tracking branch 'origin/master'