Javadoc updates
Check if exit is null