Expanded r() function to handle class exceptions.
1 file changed