Add check for manual stash management