Add additional check to "auto"
Add additional check to "auto"

neiljerram/felix,Metaswitch/calico,neiljerram/felix,neiljerram/felix,matthewdupre/felix,neiljerram/felix,Metaswitch/calico,matthewdupre/felix