Outputting exception message
Fixed conflict
Minor code cleanup
Whitespace fix: converting all line endings to unix style