DFM-1: Fixing NPE with coordinates
Merge pull request #15 from siempredelao/bugfix/DFM-1

DFM-1: Fixing NPE with coordinates