Added StateNotFoundException and modified javadoc