Removing commented out code
Actual exception message, stylistic changes