exception mapping updated.
junit test fix.
junit test fix.