Make it a bit more fail safe.