Cleaned up error module