Use exceptions defaulting to empty paths
Merge branch 'master' into scala-2.10