Improving error handling in penelope-control.