Added a few condition checks and refinements (whilst developing [ScanBooker?][1]). [1]: http://project.knowledgeforge.net/domainmodel/trac/wiki/ScanBooker URL: http://project.knowledgeforge.net/domainmodel/trac/changeset/54