Feature/upgrade descriptor

While correct, these 'os.Exit's make us inconsistent.