Merge "Converted assertion to returning error"