fixed up some error messages
Resolving conflict on server.py