fix error handling (end it to reattach bundle)
0.0.16