Fixes 500 error. Closes Vizzuality/cartodb-management#2866
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  refs Vizzuality/cartodb-management#2917
  fixed Vizzuality/cartodb-management#2917