Better dev errors and another regression case