Merge "Adding error checking" into stable/brahmaputra