WIP- Out of memory error handling