Fix unchecked nil