Add return under exception