Fixes #132. NPE.