Added a catch for load method
Moved javadoc