[SPI Fly] Fix for NPE.

Unit test included.


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