Fix unknown commands causing aborts