Fix: TypeError - can't convert nil into String