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