Some try/catch and validation cleanups