Bugfixes

A test  batch of several files was provided and we identified cases were
exception handling was needed.