Reduce log noise, better exception handling