LDC-14 #reopen
LDC-14 #reopen
changed logging message
improved error handling