Header symbols added
Proper exception catching