Change error handling in Enqueue method