Merge "use exceptions instead of return True/False"