Test with view but null entity.
Slap an EMPTY_MAP in the response if we have a view but no entity.
Remove debug output
Merge branch 'master' into release