Fixed NPEs on launch with the Promised Land