Quick fix lazy loading exceptions (#229)