Nil check fix #1394
Merge pull request #1395 from CartoDB/1394-Nil_sync

Nil check fix #1394
Merge branch 'master' into 1254-bubble