NPE handling / Some refactoring
Merge pull request #92 from CodePath-MAF/liquid-assets-fixes

NPE handling / Some refactoring