Handle registrations correctly
Skip errors
Better error for follow/stop-following
Merge branch 'master' into import