Simplify.
Enrich exception with request parameters.
Merge remote-tracking branch 'upstream/master'
add folderTree and solve tests