fixed exception handling
Merge remote-tracking branch 'origin/amsterdamDemo'
changed missedNsPrefixes Map