added handling in the case of null protocol
Merge branch 'master' into develop
version 0.5.1