Merge pull request #511 from kanoi/master

klondike - error condition handling