add exeption
Merge commit '7eef9ce60760970a7a230b45e1780f07c8253455' into rock/loader