Cleaner error handling in fixempties().
Cleaner error handling in fixempties().
Cleaner error handling in fixempties().
merge trunk