better logging, more catches
Added tag 1.0.6 for changeset 987a52bcea46