Working on better error handling.