Update to better handle programming exceptions