Add avoidance of EXC_BAD_ACCESS (Thanks! @darnel-urbandaddy)