Tweaks on registry error handling, moar caps!