Hotfix - June 11th

This is just a small hotfix for a few exceptions happening in the background