New client side error checking
Merge branch 'develop' of github.com:fahadhatib/KwaMoja into develop
Merge pull request #161 from fahadhatib/develop

Develop
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop