added wms improvements
split better catch
removed console log