Fix extend method, check for nulls et alls.