Revert + fix NullPointerException