[JMO] Fix for crash after adding task
Dialog Cleanup