Attempt to fix NPE with gson