added catch handler to filllocationdata (#161)