Security system and selector
Merge operation
Fix exception handling oversight