Minor code cleanup, more specific exception on bad getter/setter call