TESTS ARE DONE
Merge pull request #14 from CombustibleLemons/jawwad-added-error-message

Jawwad added error message
Merge remote-tracking branch 'origin/master' into fix-api-tests
Merge branch 'fix-api-tests'