Errors now handled in correct class