Reverting the changes made to fix issue #2, and fix it differently
(allow asset to be None, rather than allow its entityname to be None)