Adding comments
Proper exceptions