Fix some retain cycle warnings
Re-fix retain cycles
Error WIP
Finish error handling setup