Removed unneeded if
Moved send error checking to send_message
Merge pull request #76 from Dantemss/email_api

Email api minor fixes