* Added more roboustness to protocol parsing ...