Make sure protocol is always handled