Fix javadoc
Prevent OutOfScope exceptions
Fixes #1401