add error checks
Merge branch 'master' into tests

Conflicts:
	server/models/user.go