Added getter methods, made toString null-safe