Prevents CoreData Threading Exception

Fixes #1937 

Ready for review!

/cc @sendhil + @koke + @aerych