More bug fixes for RBDelete.
Improved error handling.