Closes #2318 - Add default mapper and refactor mapFilter to return error if nothing handles
Merge pull request #2320 from simianhacker/fix-2318

Add default mapper and refactor mapFilter to return error if nothing handles