Updated exception catching, handling '.', '+' and '?'