fix: raise proper exception
sep feature: proper conditioning
cosmetics