RELOAD-293 Fixes server crash + minor code cleanup.
Merge pull request #104 from endesigner/OneOne

RELOAD-293 Fixes server crash + minor code cleanup.