Merge "Suppressing Illegal argument exception when activating a task."