Rep 997

This should clear up the 500s for bad URIs
Should we update spring at the same time?