Add more exception handlers.
Remove unused RawDatumController.