Make option parsing in layer presenter a bit more resilient