Refactor, handle null response for dots from backend