Fix to handle cases with no asset information
Merge branch 'release/0.3.6'