Fix Null Pointer Exception.

Includes unit test.


git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1602905 13f79535-47bb-0310-9956-ffa450edef68