Added always block for promise