Refactoring & Excpeiton handling at server level