Bugs 958653, 959676, 959214 and Cleaned up UserException