Merge "Return false instead of throwing exception"