Reintroduce 33725b268d8a7a024d55e2a65b3a338b488e6824
Update breaking test so that it passes with this change.
Random change of new URI() to URI.create()
Merge pull request #816 from digitalstain/server-log

Reintroduce 33725b268d8a7a024d55e2a65b3a338b488e6824