temp code to handle None type
Merge branch 'master' of https://github.com/ld4apps/lda-serverlib