fixed minor bugs and added error messages/empty messages
Merge pull request #27 from globant/fixing

fixed minor bugs and added error messages/empty messages