Merge pull request #1238 from pingunaut/master

Add nullcheck  during favorite protocol determination