Fix IllegalStateException when specifying override locations in

server-side config

Merged from #137 in master