Ported the changes made on Pockets plugin
Updated version
Fixed bug in handling cases when objects were not initialised