Added exception is null option to display nothing if no error occured
Fixed some naming