Merge "Improved 'am switch' to handle errors."