fix 'None' return value from server