avoid exceptions, be more precise in types

avoid exceptions, be more precise in types #386