Added error handling on selection
mods