Updated 09 Feb 2017 Mac Issue: Uncaught Exception