0.0.23: Made error handling more robust