Cleaned up imports

Added null handling in trigger and action json decoding