[BUGFIX] Addons with empty directories

Was just a nit-pick, this is a good bit of cleanup (and it unblocks me on my stuff). 

Thank you!!