Improve not found err msg; Javadoc;
Fix indent