#1818 Uncaught TypeError: Cannot call method 'modal' of null
Merge pull request #1853 from xillibit/k30_bugs16

#1818 Uncaught TypeError: Cannot call method 'modal' of null