Fix BeakerException to do something more sensible.

Bug: 951985
Merge "Fix BeakerException to do something more sensible." into develop