Updated default names and error checking