Removed unused return conditions
Added Fenopy upstream
Test if Fenopy returned any results
Assure that metadata is defined before attempting to get from upstream