More cleanup; handling server errors
Merge pull request #10 from alxdarksage/develop

More cleanup; handling server errors