Check to make sure protocol is not None
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/rtwo