Removed unused method and added empty arg error handling