Improved error handling in Q_Dispatcher