Removed handling complete messages b/c it is not yet functional
Fixed a potential race condition in Dave with error handling. This is a temporary fix.