Hacky fix for an NPE