Quick, hacky fix to the NPE