Adding some fixes for commit [6537]. If there's leading whitespace, or if an exceptio...