* Handle null cipher * Check for an org being null too * Add unit and integration tests * Clean up unused members