Merge "Converted assert to error checking"