Merge pull request #3082 from alexanderkyte/no_alloc_klass_error