Fixed #102 by cheking if field exist
Merge branch 'bugfix/102' into develop