Exception fix in Server
Merge pull request #36 from Agfct/DivChanges

Exception fix in Server