fixed potential exception