Merged the more robust fix for SIS-120.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/0.3@1513773 13f79535-47bb-0310-9956-ffa450edef68