Changed error handling in Display. Fixes #664.