more robustness fixes

Author git <vivec@telvanni.eu>
Author date 2018-02-16 07:35:22
Author local date 2018-02-16 08:35:22 +0100
Committer git <vivec@telvanni.eu>
Committer date 2018-02-16 07:35:22
Committer local date 2018-02-16 08:35:22 +0100
Commit a39d52bc7e53195a2316f08873a3a246a9c1b827
Tree 469ced46d42d219d1f19e4597682b769b697111a
Parent 2e0073044f40787cab4c5ab771ebf57f70562a1d
more robustness fixes