More client side error checking
Merge branch 'develop' of github.com:KwaMoja/KwaMoja into develop