Move boto check to the correct module