Use the exception handling branch so I can test it out on staging.
Use string interpolation to avoid som nasty NPE's.