Fixes #139 500 error in multitenant mode when accessing localhost:8080