Making changes to fix Memory Host exceptions

#2073