slightly changed checks, that might help in cases as described in bug 2810280.
slightly changed checks, that might help in cases as described
in bug 2810280.

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb