Catch render errors
Catch dispatch error and small improvements