Fixed NPE
Use StringBuilder for String concatenation