Random fixes and catch exceptions graceully