Fix bug 1019844 - Don't throw uncaught errors