Server exception fixes on Fleet Management Menu
Merge branch 'master' of https://github.com/boniface/mshengu.git