Add lollipop support
Replace exception -> throwable