Fix for malformed or inexistant data returned
Merge pull request #4 from beldar/master

Fix for malformed or inexistant data returned