Fixed possible runnable exceptions