Non exception fix

Review pls