Updated exception catching, handling '.', '+' and '?'
Updating changes from pair programming