Removed useless exceptions
Small bug/incoherence fixes