Fix promises

@nandy-andy @rogatty This should bring back the promise with one exception of an error in loadMapData chain.