Better error logging
Merge branch 'split-assetmanager' into new-grid-system