Fix some NullPointerExceptions with new troll hell revisions