Beer xml

Fix a couple of exceptions that I wasn't handling properly.