Fix for malformed or inexistant data returned