Fix for None asset executed via command line
Fix for previous commit
Additional fix for None source assets
More fixes for None assets
Fixes for None assets