Feature/collector plugin improvements

This is good to add the detail of what went wrong when an exception is hit.