Fix bug where we're throwing an exception in non-exceptional circumstances.
updated amberdb version.
Merge remote-tracking branch 'origin/master' into dsc-761