Fix 45 & 56 - Stop Bookmarks from crashing

Unable to test on Nexus rooted at the moment, but I imagine that it no longer crashes, at least.
Fixes Issues #56 & #45