Improved exception handling
Unit tests for single-use slaves