Upstream changes: 0.57 07 Dec 2015 - failure to load object now returns 404 rather than throwing a 500.